home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Atari Mega Archive 1
/
Atari Mega Archive - Volume 1.iso
/
gnu
/
othergnu
/
gnuplot.zoo
/
atari.diff
next >
Wrap
Text File
|
1992-07-03
|
26KB
|
1,058 lines
diff -crbB gnuplot.org\command.c d:\tc2\gnu\gnuplot\command.c
*** gnuplot.org\command.c Sat Feb 15 17:12:08 1992
--- d:\tc2\gnu\gnuplot\command.c Thu Feb 13 00:51:12 1992
***************
*** 2871,2876 ****
--- 2871,2879 ----
#ifdef AMIGA_AC_5
char strg0[256];
#endif
+ #if defined(ATARI)&&defined(__GNUC__)
+ #include <osbind.h>
+ #endif
do_system()
{
***************
*** 2881,2887 ****
--- 2884,2903 ----
getparms(input_line+1,parms);
if(fexecv(parms[0],parms) < 0)
#else
+ #if defined(ATARI)&&defined(__GNUC__)
+ /* use preloaded shell, if available */
+ short (*shell_p)(char *command);
+ void *ssp;
+
+ ssp=(void*)Super(NULL);
+ shell_p=*(short(**)(char*))0x4f6;
+ Super(ssp);
+
+ /* this is a bit strange, but we have to have a single if */
+ if( (shell_p ? (*shell_p)(input_line+1) : system(input_line+1) ) )
+ #else
if (system(input_line + 1))
+ #endif
#endif
os_error("system() failed",NO_CARET);
}
diff -crbB gnuplot.org\demo\simple.dem d:\tc2\gnu\gnuplot\demo\simple.dem
*** gnuplot.org\demo\simple.dem Tue Feb 11 23:19:22 1992
--- d:\tc2\gnu\gnuplot\demo\simple.dem Fri Feb 28 13:21:58 1992
***************
*** 31,37 ****
plot [-30:20] sin(x*20)*atan(x)
pause -1 "Hit return to continue"
! plot [-19:19] '1.dat'with impulses ,'2.dat' ,'3.dat' with lines
pause -1 "Hit return to continue"
# undo what we have done above
--- 31,37 ----
plot [-30:20] sin(x*20)*atan(x)
pause -1 "Hit return to continue"
! plot [-19:19] '1.dat' with impulses ,'2.dat' ,'3.dat' with lines
pause -1 "Hit return to continue"
# undo what we have done above
diff -crbB gnuplot.org\internal.c d:\tc2\gnu\gnuplot\internal.c
*** gnuplot.org\internal.c Sat Feb 15 17:12:28 1992
--- d:\tc2\gnu\gnuplot\internal.c Sun Feb 09 17:01:00 1992
***************
*** 66,77 ****
#ifdef apollo
int matherr(struct exception *x) /* apollo */
#else /* apollo */
! #ifdef AMIGA_LC_5_1
int matherr(x) /* AMIGA_LC_5_1 */
struct exception *x;
#else /* Most everyone else (not apollo). */
int matherr()
! #endif /* AMIGA_LC_5_1 */
#endif /* apollo */
#endif /* MSDOS */
{
--- 66,77 ----
#ifdef apollo
int matherr(struct exception *x) /* apollo */
#else /* apollo */
! #if defined(AMIGA_LC_5_1)||defined(ATARI)&&defined(__GNUC__)
int matherr(x) /* AMIGA_LC_5_1 */
struct exception *x;
#else /* Most everyone else (not apollo). */
int matherr()
! #endif /* AMIGA_LC_5_1 || GCC_ST */
#endif /* apollo */
#endif /* MSDOS */
{
diff -crbB gnuplot.org\plot.c d:\tc2\gnu\gnuplot\plot.c
*** gnuplot.org\plot.c Sat Feb 15 17:12:36 1992
--- d:\tc2\gnu\gnuplot\plot.c Sun Mar 08 17:54:16 1992
***************
*** 57,62 ****
--- 57,66 ----
#include <graphics.h>
#endif
+ #if defined(__GNUC__)&&defined(ATARI)
+ #include <osbind.h>
+ #endif
+
extern char *getenv(),*strcat(),*strcpy(),*strncpy();
extern char input_line[];
***************
*** 134,165 ****
#define HOME "sys$login:"
#else /* vms */
! #ifdef MSDOS
#define HOME "GNUPLOT"
! #else /* MSDOS */
!
! #if defined(AMIGA_AC_5) || defined(AMIGA_LC_5_1)
!
! #define HOME "GNUPLOT"
! #else /* AMIGA */
#define HOME "HOME"
! #endif /* AMIGA */
! #endif /* MSDOS */
#endif /* vms */
! #ifdef unix
! #define PLOTRC ".gnuplot"
! #else /* unix */
! #if defined(AMIGA_AC_5) || defined(AMIGA_LC_5_1)
#define PLOTRC ".gnuplot"
! #else /* AMIGA */
#define PLOTRC "gnuplot.ini"
! #endif /* AMIGA */
! #endif /* unix */
#ifdef __TURBOC__
void tc_interrupt()
--- 138,159 ----
#define HOME "sys$login:"
#else /* vms */
! #if defined(MSDOS) || defined(AMIGA_AC_5) || defined(AMIGA_LC_5_1) || defined(ATARI)
#define HOME "GNUPLOT"
! #else /* MSDOS || AMIGA || ATARI */
#define HOME "HOME"
! #endif /* MSDOS || AMIGA || ATARI */
#endif /* vms */
! #if defined(unix) || defined(AMIGA_AC_5) || defined(AMIGA_LC_5_1)
#define PLOTRC ".gnuplot"
! #else /* AMIGA || unix */
#define PLOTRC "gnuplot.ini"
! #endif /* AMIGA || unix */
#ifdef __TURBOC__
void tc_interrupt()
***************
*** 297,302 ****
--- 321,330 ----
(void) signal(SIGINT, ss_interrupt);
#endif
#else /* MSDOS */
+ #if defined(__GNUC__)&&defined(ATARI)
+ /* clear keybd buffer - strange GCC bug with signal(SIGINT) */
+ while( Cconis() ) Cnecin();
+ #endif /* GNUC && ATARI */
(void) signal(SIGINT, inter); /* go there on interrupt char */
#endif /* MSDOS */
}
***************
*** 313,320 ****
#ifdef vms
(void) strcpy(home,HOME);
#else /* vms */
#if defined(AMIGA_AC_5) || defined(AMIGA_LC_5_1)
- strcpy(home,getenv(HOME));
{
int h;
h = strlen(home) - 1;
--- 341,356 ----
#ifdef vms
(void) strcpy(home,HOME);
#else /* vms */
+ #if !defined(AMIGA_AC_5)&&!defined(AMIGA_LC_5_1)&&!defined(MSDOS)&&!defined(ATARI)
+ (void) strcat(strcpy(home,getenv(HOME)),"/");
+ #else
+ char *tmp_home=getenv(HOME);
+
+ if( !tmp_home ) {
+ home[0]='\0';
+ } else {
+ strcpy(home,tmp_home);
#if defined(AMIGA_AC_5) || defined(AMIGA_LC_5_1)
{
int h;
h = strlen(home) - 1;
***************
*** 326,334 ****
}
}
#else /* AMIGA */
! (void) strcat(strcpy(home,getenv(HOME)),"/");
#endif /* AMIGA */
#endif /* vms */
#ifdef NOCWDRC
/* inhibit check of init file in current directory for security reasons */
{
--- 362,374 ----
}
}
#else /* AMIGA */
! if( strlen(home) && home[strlen(home)-1]!='\\' )
! strcat(home,"\\");
#endif /* AMIGA */
+ }
+ #endif /* !AMIGA && !MSDOS && !ATARI */
#endif /* vms */
+
#ifdef NOCWDRC
/* inhibit check of init file in current directory for security reasons */
{
diff -crbB gnuplot.org\plot.h d:\tc2\gnu\gnuplot\plot.h
*** gnuplot.org\plot.h Sat Feb 15 17:12:46 1992
--- d:\tc2\gnu\gnuplot\plot.h Mon Feb 10 23:07:40 1992
***************
*** 39,45 ****
--- 39,49 ----
#if defined(AMIGA_LC_5_1) || defined(AMIGA_AC_5)
#define SHELL "NewShell"
#else /* AMIGA */
+ #ifdef ATARI
+ #define SHELL "gulam.prg"
+ #else /* ATARI */
#define SHELL "/bin/sh" /* used if SHELL env variable not set */
+ #endif /* ATARI */
#endif /* AMIGA */
#define SAMPLES 100 /* default number of samples for a plot */
***************
*** 111,116 ****
--- 115,124 ----
#endif
+ #ifdef ATARI
+ #define OS "TOS "
+ #endif
+
#ifndef OS
#define OS ""
#endif
***************
*** 260,268 ****
--- 268,278 ----
LEFT, CENTRE, RIGHT
};
+ #if !(defined(ATARI)&&defined(__GNUC__)&&defined(_MATH_H)) /* FF's math.h has the type already */
struct cmplx {
double real, imag;
};
+ #endif
struct value {
diff -crbB gnuplot.org\readline.c d:\tc2\gnu\gnuplot\readline.c
*** gnuplot.org\readline.c Sat Feb 15 17:12:54 1992
--- d:\tc2\gnu\gnuplot\readline.c Sun Feb 09 21:41:44 1992
***************
*** 69,75 ****
#endif
! #ifndef MSDOS
/* UNIX specific stuff */
#ifdef TERMIOS
--- 69,75 ----
#endif
! #if !defined(MSDOS)&&!defined(ATARI)
/* UNIX specific stuff */
#ifdef TERMIOS
***************
*** 81,95 ****
#endif /* TERMIOS */
static int term_set = 0; /* =1 if rl_termio set */
! #else
!
/* MSDOS specific stuff */
#define getc(stdin) msdos_getch()
static char msdos_getch();
!
#endif /* MSDOS */
-
/* is it <string.h> or <strings.h>? just declare what we need */
extern int strlen();
extern char *strcpy();
--- 81,101 ----
#endif /* TERMIOS */
static int term_set = 0; /* =1 if rl_termio set */
! #else /* !MSDOS && !ATARI */
! #ifdef MSDOS
/* MSDOS specific stuff */
#define getc(stdin) msdos_getch()
static char msdos_getch();
! #else /* MSDOS */
! /* ATARI then */
! #ifdef getc
! #unde